Merge up and generally make shadow mode be nice.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 20:23:06 +0000 (21:23 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 20:23:06 +0000 (21:23 +0100)
commit11556202e4d205f0b48344ab60ae15ba39ae5fee
tree678695f2cd38dbe74f2817f9a49b548b1337bac0
parentfed521422d25a35b7ce494fd9ab0712bd5e60f92
parent5429c5d16ec7b9f46f177fbf82287d0a82e1a1e9
Merge up and generally make shadow mode be nice.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
22 files changed:
linux-2.6-xen-sparse/arch/xen/i386/kernel/ldt.c
linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c
linux-2.6-xen-sparse/arch/xen/i386/mm/init.c
linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c
linux-2.6-xen-sparse/arch/xen/kernel/Makefile
linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h
linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h
linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h
linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
linux-2.6-xen-sparse/include/asm-xen/gnttab.h
linux-2.6-xen-sparse/mm/memory.c
xen/arch/x86/mm.c
xen/arch/x86/shadow32.c
xen/common/kernel.c
xen/common/memory.c
xen/include/asm-x86/shadow.h